Merged.
authoremellor@ewan <emellor@ewan>
Wed, 12 Oct 2005 12:20:10 +0000 (13:20 +0100)
committeremellor@ewan <emellor@ewan>
Wed, 12 Oct 2005 12:20:10 +0000 (13:20 +0100)

Trivial merge